No need to re-set vm_pgoff before calling remap_pfn_range(). It will do

it itself in cases where it is necessary.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
index c8671dbeb79e77b0a01043c98cf17b70247aee5b..a130cbcf729921543fd89da77884b399fbe9a11b 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
@@ -957,9 +957,8 @@ static int xsd_kva_mmap(struct file *file, struct vm_area_struct *vma)
        if ((size > PAGE_SIZE) || (vma->vm_pgoff != 0))
                return -EINVAL;
 
-       vma->vm_pgoff = mfn_to_pfn(xen_start_info->store_mfn);
-
-       if (remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
+       if (remap_pfn_range(vma, vma->vm_start,
+                           mfn_to_pfn(xen_start_info->store_mfn),
                            size, vma->vm_page_prot))
                return -EAGAIN;